Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

khadas-edge2: add vendor uboot to images #6754

Merged
merged 2 commits into from
Jun 17, 2024
Merged

khadas-edge2: add vendor uboot to images #6754

merged 2 commits into from
Jun 17, 2024

Conversation

igorpecovnik
Copy link
Member

@igorpecovnik igorpecovnik commented Jun 17, 2024

Description

Replication of #6741

Khadas Edge 2 images has been shipped without Uboot and it may cause some problems like not-booting when eMMC and SPI is empty. This PR adds vendor's uboot to Edge 2 images.
I've also added BL32 blob because the board doesn't boot when SPI has BL32 blobs and SD card doesn't have.

cc @rpardini @viraniac

How Has This Been Tested?

  • SPI + SD card
  • Empty SPI + SD card
  • SPI + eMMC
  • Empty SPI + eMMC

Checklist:

Please delete options that are not relevant.

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

@igorpecovnik igorpecovnik requested a review from a team as a code owner June 17, 2024 12:11
@github-actions github-actions bot added size/medium PR with more then 50 and less then 250 lines Hardware Hardware related like kernel, U-Boot, ... labels Jun 17, 2024
@igorpecovnik igorpecovnik merged commit d2e40d6 into main Jun 17, 2024
8 checks passed
@igorpecovnik igorpecovnik deleted the edge2-add-uboot branch June 17, 2024 12:11
declare -g BOOTSOURCE='https://github.com/khadas/u-boot.git'
declare -g BOOTBRANCH='branch:khadas-edges-v2017.09'
declare -g BOOTPATCHDIR="legacy/u-boot-khadas-edge2-rk3588"
declare -g BOOTCONFIG="khadas-edge2-rk3588s_defconfig"
declare -g SRC_EXTLINUX="yes" # For now, use extlinux. Thanks Monka
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff. I suppose we can remove the SRC_EXTLINUX here and use boot.cmd/scr like other boards? kedge2 was different in this aspect; using boot.scr enables armbianEnv.txt, overlay selection, etc.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Hardware Hardware related like kernel, U-Boot, ... size/medium PR with more then 50 and less then 250 lines
Development

Successfully merging this pull request may close these issues.

3 participants